Skip to content

More external_deps build fixes#1642

Merged
slipher merged 9 commits intoDaemonEngine:masterfrom
slipher:extdeps-fix
May 29, 2025
Merged

More external_deps build fixes#1642
slipher merged 9 commits intoDaemonEngine:masterfrom
slipher:extdeps-fix

Conversation

@slipher
Copy link
Copy Markdown
Member

@slipher slipher commented Apr 10, 2025

The 6 issues fixed here are present both in master, and with #1433.

slipher added 9 commits April 22, 2025 06:31
There was a stray pkgconfig in the list of required packages for one of
the Windows platforms. pkgconfig only makes sense as a host-mode
dependency. Also it crashes the compiler.
The build script for mingw sdl2 uses prebuilt binaries, but calls a
makefile which only substitutes some hard-coded paths into some build
config helpers and copies the files. Just copy the files ourselves and
don't munge the configs: the unmunged cmake uses a relative path
which is actually what we want. In newer SDL versions the makefile munges the
cmake configs (in addition to the shell-based one) which breaks us.
In the cmake config files in lib/cmake, substitute .dll.a -> .lib
when targeting MSVC.
We don't want the DLLs we build to depend on the MinGW standard library
DLLs.
Building glew for windows-i686-mingw resulted in a link error about
undefined strlen. This happend because setting CFLAGS.EXTRA on the Make
command line clobbers some required flags. Pass the flags in a different
way so they append rather than clobbering.
Copy link
Copy Markdown
Contributor

@VReaperV VReaperV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@slipher slipher merged commit 5f654ff into DaemonEngine:master May 29, 2025
4 checks passed
@slipher slipher deleted the extdeps-fix branch May 29, 2025 23:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants